Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 15 Aug 2011 19:19:54 +0000 (12:19 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 15 Aug 2011 19:19:54 +0000 (12:19 -0700)
commitc835c49d5eedb8bded2f1de4d19bed8a39ce3038
tree63b7a28b7e8d08b9ad4f671fe5c6bce03c47932b
parent7bd15b0a721c369da625429fce7d220ab4053a8f
parent0653a84f2715f01b1e741a30817bf0e9fb5984eb
Merge from trunk.
src/ChangeLog
src/bidi.c
src/dispextern.h
src/xdisp.c